From 858d4fb007297058435a8d8b8da302148945ff4e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Javier=20Jard=C3=B3n?= <javierjc1982@gmail.com>
Date: Sat, 10 Oct 2009 19:38:23 +0200
Subject: [PATCH] Remove remaining GtkButtonBox deprecated stuff

This completes commit b1b986cc604bffd924a13fbcb180dd234a0b8d14
---
 docs/reference/gtk/gtk-sections.txt | 6 ------
 docs/tutorial/gtk-tut.sgml          | 1 -
 examples/buttonbox/buttonbox.c      | 1 -
 gtk/gtk.symbols                     | 6 ------
 tests/testgtk.c                     | 5 ++++-
 5 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt
index 7bc0918139..54ead84b06 100644
--- a/docs/reference/gtk/gtk-sections.txt
+++ b/docs/reference/gtk/gtk-sections.txt
@@ -422,15 +422,9 @@ gtk_aspect_frame_get_type
 <TITLE>GtkButtonBox</TITLE>
 GtkButtonBox
 GTK_BUTTONBOX_DEFAULT
-gtk_button_box_get_spacing
 gtk_button_box_get_layout
-gtk_button_box_get_child_size
-gtk_button_box_get_child_ipadding
 gtk_button_box_get_child_secondary
-gtk_button_box_set_spacing
 gtk_button_box_set_layout
-gtk_button_box_set_child_size
-gtk_button_box_set_child_ipadding
 gtk_button_box_set_child_secondary
 <SUBSECTION Standard>
 GTK_BUTTON_BOX
diff --git a/docs/tutorial/gtk-tut.sgml b/docs/tutorial/gtk-tut.sgml
index d140cd0d92..11407be476 100755
--- a/docs/tutorial/gtk-tut.sgml
+++ b/docs/tutorial/gtk-tut.sgml
@@ -7328,7 +7328,6 @@ static GtkWidget *create_bbox( gint  horizontal,
   /* Set the appearance of the Button Box */
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
   gtk_box_set_spacing (GTK_BOX (bbox), spacing);
-  /*gtk_button_box_set_child_size (GTK_BUTTON_BOX (bbox), child_w, child_h);*/
 
   button = gtk_button_new_from_stock (GTK_STOCK_OK);
   gtk_container_add (GTK_CONTAINER (bbox), button);
diff --git a/examples/buttonbox/buttonbox.c b/examples/buttonbox/buttonbox.c
index d48bbfa5dc..1809154d8d 100644
--- a/examples/buttonbox/buttonbox.c
+++ b/examples/buttonbox/buttonbox.c
@@ -26,7 +26,6 @@ static GtkWidget *create_bbox( gint  horizontal,
   /* Set the appearance of the Button Box */
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
   gtk_box_set_spacing (GTK_BOX (bbox), spacing);
-  /*gtk_button_box_set_child_size (GTK_BUTTON_BOX (bbox), child_w, child_h);*/
 
   button = gtk_button_new_from_stock (GTK_STOCK_OK);
   gtk_container_add (GTK_CONTAINER (bbox), button);
diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index fd95dd5610..943455bcf1 100644
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -493,12 +493,6 @@ gtk_builder_value_from_string_type
 
 #if IN_HEADER(__GTK_BUTTON_BOX_H__)
 #if IN_FILE(__GTK_BUTTON_BOX_C__)
-#ifndef GTK_DISABLE_DEPRECATED
-gtk_button_box_set_child_size
-gtk_button_box_set_child_ipadding
-gtk_button_box_get_child_ipadding
-gtk_button_box_get_child_size
-#endif
 gtk_button_box_get_child_secondary
 gtk_button_box_get_layout
 gtk_button_box_get_type G_GNUC_CONST
diff --git a/tests/testgtk.c b/tests/testgtk.c
index bfe57340b7..59e3eb174b 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -1232,7 +1232,10 @@ create_bbox (gint  horizontal,
 
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout);
   gtk_box_set_spacing (GTK_BOX (bbox), spacing);
-  gtk_button_box_set_child_size (GTK_BUTTON_BOX (bbox), child_w, child_h);
+  g_object_set (bbox,
+                "child-min-width", child_w,
+                "child-min-height", child_h,
+                NULL);
   
   button = gtk_button_new_with_label ("OK");
   gtk_container_add (GTK_CONTAINER (bbox), button);
-- 
2.30.2